Include gdk/gdkdrawable.h with gdk/ prefix. (Pointed out by

Sun Oct  3 14:16:23 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkdrawable.h: Include gdk/gdkdrawable.h with
	gdk/ prefix. (Pointed out by chak@is.tsukuba.ac.jp)

	* x11/: create x-specific subdirectory.

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 5962d18c8158aa08c509defc70f9ecb0692903cf..79311c8c156d8a06c2c0535d1f4ce9da3031166c 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,5 +1,7 @@
 ## Makefile.am for gtk+/gdk
 
+SUBDIRS=x11
+
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -I$(top_srcdir)         \
@@ -27,6 +29,9 @@ libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
        -lm             \
 @STRIP_END@
 
+libgdk_la_LIBADD = \
+       x11/libgdk-x11.la       
+
 #
 # setup source file variables
 #
@@ -91,9 +96,6 @@ gdk_c_sources = @STRIP_BEGIN@ \
        gdkwindow.c     \
        gdkxid.c        \
        MwmUtil.h       \
-       gxid_lib.h      \
-       gxid_proto.h    \
-        gxid_lib.c     \
 @STRIP_END@
 
 #
@@ -138,21 +140,6 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-#
-# extra programs
-#
-EXTRA_PROGRAMS = gxid
-bin_PROGRAMS = @xinput_progs@
-LDADDS = @STRIP_BEGIN@ \
-       @x_ldflags@     \
-       @x_libs@        \
-       @GLIB_LIBS@     \
-       -lm             \
-@STRIP_END@
-gxid_SOURCES = gxid.c
-gxid_LDADD = $(LDADDS)
-
-
 .PHONY: files
 
 files:

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index d4fd6eeb49b8c33c654186546b15f8d5646b730f..30b217264a176bc601e69bfc64a101b54c9d5f00 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -1,7 +1,7 @@
 #ifndef __GDK_DRAWABLE_H__
 #define __GDK_DRAWABLE_H__
 
-#include <gdktypes.h>
+#include <gdk/gdktypes.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gdk/gdkinput.c b/gdk/gdkinput.c
index 8f75330067f486b792c8e6c4473a2eede0ab0604..874a6cafe09fa4f966a1a32d2bb30ff2c647871a 100644 (file)
--- a/gdk/gdkinput.c
+++ b/gdk/gdkinput.c
@@ -29,6 +29,7 @@
 #include <X11/Xutil.h>
 #include "config.h"
 
+#include "gdkx.h"
 #include "gdkinput.h"
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
new file mode 100644 (file)
index 0000000..1da1965
--- /dev/null
+++ b/gdk/x11/Makefile.am
@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+INCLUDES = @STRIP_BEGIN@       \
+       -DG_LOG_DOMAIN=\"Gdk\"  \
+       -I$(top_srcdir)         \
+       @GTK_DEBUG_FLAGS@       \
+       @GTK_XIM_FLAGS@         \
+       @GTK_LOCALE_FLAGS@      \
+       @GLIB_CFLAGS@           \
+       @x_cflags@              \
+@STRIP_END@
+
+LDADDS = @STRIP_BEGIN@         \
+       @x_ldflags@     \
+       @x_libs@        \
+       @GLIB_LIBS@     \
+       -lm             \
+@STRIP_END@
+
+noinst_LTLIBRARIES = libgdk-x11.la
+
+libgdk_x11_la_SOURCES =  \
+       gxid_lib.c       \
+       gxid_lib.h       \
+       gxid_proto.h
+
+EXTRA_PROGRAMS = gxid
+bin_PROGRAMS = @xinput_progs@
+
+gxid_SOURCES = gxid.c
+gxid_LDADD = $(LDADDS)
+
+#EXTRA_DIST = \
+#      MwmUtil.h         \
+
+

diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 8f75330067f486b792c8e6c4473a2eede0ab0604..874a6cafe09fa4f966a1a32d2bb30ff2c647871a 100644 (file)
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -29,6 +29,7 @@
 #include <X11/Xutil.h>
 #include "config.h"
 
+#include "gdkx.h"
 #include "gdkinput.h"
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"